CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/envoy/.
envoyproxy/api-shepherds assignee is @markdroth
CC @envoyproxy/api-watchers: FYI only for changes made to api/envoy/.

hi @douglas-reid you will need to ensure that all files end with a newline (as opposed to an empty line)

you probably want to set your editor to ensure

• newline endings
• no mixed tabs/spaces
• no trailing whitespace

hi @douglas-reid you will need to ensure that all files end with a newline (as opposed to an empty line)

@phlax thanks for the quick response. i had hoped the clang-format steps were taking care of that stuff. I've updated all the files now I believe.

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

i had hoped the clang-format steps were taking care of that stuff.

these 3 formatting tests are language-agnostic, so happen before and separately to any clang formatting checks

I've updated all the files now I believe.

there is still a couple with newline issues - my strong recommendation would be to set your editor to automatically fix these 3 issues on save

/lgtm api

there is still a couple with newline issues - my strong recommendation would be to set your editor to automatically fix these 3 issues on save

thanks for your patience. I thought I had done that, but must have missed a setting somewhere. hopefully, this should be resolved now (based on local runs of glint)

/retest

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

/retest

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

@phlax all the tests are passing now.

ill have to pass it on for final review to one of the other maintainers (cc @dio @htuch )

i think you will need to merge main (version history changed with last release)

also im wondering if its necessary to change the requirements.txt file - afaict the additional dependencies arent used (also the added dependences are already available from base_pip3 )

LGTM.

ok. rebased and pushed. hopefully 100% ready at this point.

/lgtm deps

@envoyproxy/api-shepherds I think this is waiting on a re-review.

@zuercher It looks like a conflict has appeared again in the intervening time.

What is the right way to get this in? Should I rebase again and start the wait over, or should I hold off until the final approval is granted again before rebasing?

Don't rebase it. Just merge main and fix the conflict. We'll squash the commit to master. I'll try another means to get api re-approval.

/lgtm api

(I don't think that worked, unfortunately.)

/lgtm api

@zuercher ok. merged and pushed. ptal.

Thanks everyone, for your patience and guidance on this PR. Excited to have the capability merged!